More work converting to the TokenStreamRewriter paradigm.