Clean-up namespace.

More #7.