forked from phoedos/pmd

- Since annotated primitives are now stand-alone instances, ensure they share the supertypes for the unnanotated version, otherwise, NPEs occur during inference.
- Since annotated primitives are now stand-alone instances, ensure they share the supertypes for the unnanotated version, otherwise, NPEs occur during inference.