More cleanup surrounding step defs.