Tweak the imports to avoid warnings on GHC 7.2