Got rid of token store, made parser use nsscanner