More use of MetaDataUtils.isMemberEmbedded