Major simplification of expressions

...and major cleanup needed!