Unindent namespaces, simplify interface, add namespace alias where
appropriate.