I think if we moved the options_bootstrapper and working_set passing to GoalRunner.__init__() it’d let us clean up much of the initialization code that now happens outside of __init__()