This change refactors a number of aspects of the CLI's treatment of steps, in line with the new scheme, and a number of other miscellaneous and minor fixes. It also regenerates all RPC code impacted by recent renames.