Yeah, you're right. And `addToStepStack()` is probably getting long...