The yak shave was to instead re-register all the subsystem options on the inner scope.