Make handling of private server IDs more consistent.