Start fixing pp-number tokenization.