Some EditEntity cleanup

see also https://gerrit.wikimedia.org/r/#/c/68161/

Bug: 48137

Change-Id: I8666bbad10595237ae89fcaf9f0f649656951037
Merge "Some EditEntity cleanup"