Hmm.  Can we avoid yet another canonicalization place?