Further cleanup after code-review.