Tidying up parens and fixing a compile warning.