Problems with diff-only fixed in trunk.