Merge jc/diff leftover bits.