Changes toward building with GHC 7.4.2