Be somewhat more consistent about parenthesis use