More work done. Expression parsing largely unimplemented: finalize expression macro syntax.