RPC: Refactor Context and update sink

See discussion at !1092 (d52d50f9) ; also see #817 (closed) .

Also see !1092 (comment 2894530).