Rejig some code so Control.Exception and GHC.Conc don't need recursive imports