Thought I got all I've missed in rP22313 in rP22367, but as it turns our returning resources missed their interface.
I've quadruple-checked, and I haven't found any order that still remains buggy, but given my track record on this change, I could still be missing one.
The order did completely redundant things with the call so remove that duplication.