typing touchups. Preparing for major refactor for extensibility
typing touchups. Preparing for major refactor for extensibility

jbschlosser/rustty,jbschlosser/rustty,Syntaf/rustty,Syntaf/ruik,dflemstr/rustty,Syntaf/rustty,Syntaf/ruik,tempbottle/rustty,Syntaf/fe-rustty,tempbottle/rustty,Syntaf/fe-rustty,cpjreynolds/rustty,dflemstr/rustty