DDF-379: Review comment fixes.