r8931: command-output fixes