Should now compile with GHC 7.4