Cleanup of imports in NotGHC module.