Static Function Refactorings

Companion commit to the pull request in the main repo.