Minor boilerplate reduction