[cvs-nhc98] patch applied (hat): Simplify re-ordering of module imports. Need to ensure that NHC.Internal