DDF-374: Update to fix some code style warnings.