Fixes brace fixer issues with some comments

* Resolves #243 for all control statements; not just if
* Addresses a problem where comments immediately following the closing parenthesis which contain parentheses will not be corrected.
* Adds additional test cases to cover issue