More cleanup. (Much less "terminate these steps".)