Merge "Use parens to fix output"