Merge "Further ProcessBuilder tweaks."