Restructured arithmetic expression handling to move generic handling into AST.