Tidying up addon_registry hooks a bit
Tidying up addon_registry hooks a bit