Tweak execvpe.h hack (see 256b19184bcb) some more