Improved TempoSpanner markup handling.

All markup works correctly as of this commit.