Modernized ClefSpanner.