More work on merging JSAST and Expression.

This is a WIP.

It compiles now, but only because I commented out some things.