follow GHC HEAD changes