Use the new registry functions in registry.c.