Fix test; use workaround for type canonicalization
The context-dependent nature of the mangling is broken under the status
quo due because "equivalent" dependent types need different mangling.
CWG 2946 has been opened to clarify such cases as being not equivalent.
