Step one of several towards a nice namespace approach and
better API documentation.