Tidying up addon_registry hooks a bit