Code cleanup.

    From PR review.