Normalise everything before 'with' abstraction

Now the TMP HACK in Data.Bits can go