Drop a load of unnecessary parens

A couple left that I felt uncomfortable removing as they aided
readability a little in long `if` clauses.
Lines: 1979 and 2031
Merge pull request #2 from DanielFerguson/cleanup_parens

Drop a load of unnecessary parens