We now use pre_cmd rather than cmd_prefix wherever possible. Also, pass "-s --no-print-directory" whenever we use pre_cmd.