DDF-59, DDF-60: Cleaned up a bad merge