Minor change to further support tools already being in the execution path.