Clean up clumsy use of parentheses.