this makes retrieval static analysis friendly without extra steps.
this isn't a perfect fix, but it's better than it whining about all the things.