Making the code *actually* compatible with GHC7.6