Expression parser update

Updates the implementation of the expression parser functions for the changes of pull request 95 of native.