Simple type-checking for better merge updates.
Include new fields in diff

RFC: How to handle deleted fields?