Remove --type-in-type
Break out the nominal thing
Modularize