Initial stab at lazy option descriptor registration
Remaining add-ons now use pluggable option provider services
Reworking boot process to allow option descriptors to be registered earlier