Refactor subscription updates to the "new style" client API