Make our code easier to understand to static analyzers

Rely on fetched values rather than API (reduces 2x fetch anyway)
Don't use overly generic API when we know what we want to happen.
Assert when we're assuming something.