Improved function parser to use ast parser instead of Worder

Improved function parser to use ast parser instead of Worder #1722