Fix handling of ubiquitous tokens used in grammar rules