Merge "ahat: Improve field diffing."