I have forgotten what the original driver for this change was.
There is quite a bit of refactoring in TcCanonical; the rest
is minor.