I was a bit worried about this.  I've refactored so the _query methods return the scscf as an output parameter, and I've moved the fields decoded from the HSS response into an _hss_rsp substructure to make it clear that is the scope.