Moved some declarations that should have been in the namespace.