more pid_t cleanups from the 2.0 branch