cleanup parens and macros n' such