Load EntityRefs where possible instead of Entities

Tries to avoid unnecessary loading of properties, minor reordering of calls to optimize same. Further optimization will likely require deeper exploration of RelationshipManager's use of properties, but these changes should help localize that.