Fix compilation on 7.9

This follows some TH changes introduced in GHC 7.9

I also remove trailing whitespace in a separate commit. Feel free to discard that one if you don't want it.

This allows lens (and other libs) to build with 7.9.