[PATCH] clean up usual_conversions(), kill evaluate_shift()