simplify some types

...preparing to make good on `Name'
copy-paste considered harmful

and other curious stories, vol. 2