Fix format handling in resolver, correct DDF looping bugs.