Remove a bit of boilerplate