Fixes #2197
Renumber parts in subtyping.topscript
Fixes #2205
Merge pull request #4 from lpw25/address-comments

Address comments