Sort out GHC 7.4.2 compatibility