My apologies, I didn't see it.

That's a start, but it does need to be done explicitly in each of the places that uses it. Any `__virtual__()` functions will need to do it, and the fileclient stuff will need to do it.