Tidy up the hsc2hs thing better.