fix alignment, trailing parens &c.