Some restructuring in JSONRPCRequest