Detect more token types, improve names
Make state evolution table more compact by using better macros