Fix up command handling for user convenience.