Miscellaneous older GHC fixes, part 2