Try to remember to remove the parens from these lines (I know it's hard to spot them all). This won't stop the merge, btw.