Finish the workaround needed for make_shared instantiation of Entities. Lord Rex: if this is too hackish and not worth the trouble, please feel free to remove.