No-module way, and some better phrasing for namespaces.