Improve static value look ahead parsing
Merge pull request #773 from xzyfer/fix/improve-parsing-static-values

Improve parsing of static values