Closes #415: remove c-specific hacks, harmful on emacs 24.3