Better way to handle nested spans/brs.

I think this solution is actually correct.  It makes a previous test
work.