Avoid some unnecessary scopes.
Merge branch 'master' into jsonpath
Pass virtual hash with '$' at root.
Minor reorg of closure context.

Create context stack in initialiser.