Audit/clean up fetch functions

Created by: lrhacker

Some of the fetching callbacks we are using are a bit complicated and difficult to parse (see this PR comment for one example).

Look into ways to clean up, simplify, or otherwise refactor some of the various fetching callbacks to make them easier to understand and less bug-prone.