Refactor handling of ubiquitous tokens when building parse table