Canonicalise correctly.