moved "super" handling into type chooser and removed redundant branch
2 files changed