Make more progress on diff code.