Fix handling of --command and/or --executable-in-path (fixes #1)