Improvements to entity diffing code

What was wrong with using the constant? I saw you doing this several times now. What's the benefit of decoupling this? This makes maintenance much harder.