Expand regex/string rules as part of grammar preparation

This makes it possible to report errors in regex parsing
Fix symbol names for extracted tokens