Continued work on mapping from antlr ast to new ast.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>