Move functions back into same namespace

Discovered issue with my inlining method, due to the namespace
used to inline not applying to all functions as we walk the tree.
Update compiled JS