Minor namespacing.