Some small clean-ups to convert_expr.