CDK-501: Add fixes from Ben's review.