Fixed some major issues with method namespacing and other closure
aspects.