Get rid of some more unneeded boilerplate