...
JsFunc code optimisations
code improvements to builder