cleanup to make it compile on GHC 7.4.1