Move pipe2-safer code to its own file.