Replace remaining shelled-out `which`es