Fix build for GHC HEAD