(WIP) reformat more miscellaneous type classes