More tweaking of command code.