fix mackerel

Further changes to allow successful compilation under GHC 7.6; previous patch broke mackerel, this should fix it.