SUNRPC: Further cleanups