More tokenizer spec parsing
auto-merge staging into master