Issue #319: Move references to embeds.