Final cleanup before issuing pull request.