Canonize composite type vars: All tests pass