Un-reversed some more! Also, separate PIDs.

Separate PID constants, that is.