Make compilable (fix duplicate parentheses and other merge hickups)