9160044f5f
Lay the groundwork for switching to binary wrappers by reducing uses of `--run` (which is not supported by `makeBinaryWrapper`).