Longer-term, I see `uniformState` becoming part of `frameState` so this function will only take `frameState`, but that change is outside of the scope of this pull request.