Improvements to entity diffing code

Description missing.