Added string expansion in CFG->PDA parsing.
Stack based branching in CFG parser seems to work, not so much substring
capturing.
Capturing for pda parsing works again.
Merge branch 'parser-perf-refact'