Improve utils support for FlexEntities.