Expression parsing improvements