Basic work to get ready for variable namespaces.