One step turned two. Worse? Yes. Tedious? No. It’s worth it given the other conceptual changes and the fact that this is very much an edge case.