support GHC 7.8; minor cleanup