Fix Span removal bug when linked against libc++