subtyping cleanup, version as generated