WIP: Get things building on recent GHC HEAD