Remove trailing whitespace; remove parens in same place in two different files