CDK-343: Fix comments from PR #20.