Revert "Restore closing parens."

This reverts commit 1b0f96a6aee72f89e4da34943fc31e153afcffbc.
Revert "Remove namespace mumbo jumbo."

This reverts commit a70024b77fd863529177ff1fb6ada174eecb1461.