Minor merge fix
Fixed support for raw code using raw()
Changed tree for expressions to contain info about being an expression
Fixed parse issue