Cleanup after Mikey's pull request.