The one non-comment change is a small refactoring/simplification
in TcCanonical that should have no impact: avoiding flattening twice.