Rewrite the canonicalizer so hopefully it can no longer get stuck, ever, period.