It would be better to avoid this additional canonicalization place.  Do we need this here?