More reuse of getEntity, refs D221