#1678: Fix bug causing repeated nesting of spans around embeds.