Remove some boilerplate.