Fix over-canonicalization in 1.8 mode that broke tracing tests.