Fixup the diffs

Now that we have the spec in two parts, this patch re-enables construction of diffs.