Fixing GHC-7.9 issues.