[BUG #7710] Play nice with existing markup