[WIP] Merge expr and jsast - not for review

This doesn't build. Not for review (but feel free to have a look).

Started merging Expression and JSAST data types into one data type (AST).