Some boilerplate cleanup.