Fix canonicalization of AnnotatedType

We want our new annotated types to be canonically equivalent to their
underlying types. This makes all the type checking and such work out nicely.