Small improvements to command-line execution.