Cleanup EntityContentDiffView

This is a follow up to I0567dde. Plus a bit of additional cleanup
to get rid of all orange warnings in PHPStorm.

Change-Id: I12269f2d55adf0d3ecb6b165013f40208aeb3afb