add reference of call node to ExpressionHandler
remove reference to root node
Merge branch 'master' into hist