Found a bunch in the `tools` and `cpu` dirs that I never checked for calls to this function - will update the pull request!