Further boilerplate reduction.