Adds support for unescaped variables
Fixes underscores in identifiers