Some more minor cleanup for "net rpc audit".