simplify canonicalization a little