Got toktype out of `popstack`
Got rid of toktype entirely
Fix #37 part