Fix build for newest GHC HEAD