LCM: Minor modifications in preparation of possible replacement of EntityKey
with just Entity.