Jump through excruciable hoops to ensure step-into and step-over commands are repeatable