Clean up expression parser and wire to assembler