Tweak for GHC 7.8.2 compilation and various hlint-inspired improvements.