This removes the pid_workspace bits from tree/root before it gets too interesting. No functional change.
