GPII-127: Clean-up based on pull request comments.