Move the autoselection variables to be per-thunk rather than per-program since that's what it should have been in the first place.