More work on proper namespacing.