e4de538dae
## Summary After #15395, I realized that we didn't actually need a separate struct for this since we now pass it around as an `Option`. (The key change from #15395 is that when combining, we treat the options as a single unit.)