> You are stuffing legacy stuff in Entity.php?

No. The legacy stuff is already in there. This code translates it to non-legacy stuff, which is a steps towards getting rid of the legacy stuff