Remove some needless parens.
Clean up the commented code as well.