Cleaning up the namespace mechanism, eliminating unnecessary this bindings, etc.