[FOLD] Tidy RPCHandler