fixup! Refactor away RPCHandler::doRpcCommand