With the new closure approach, the code can be simplified and cleaned up quite a bit. This also removes four parameters, which is helpful for future additions (!123616) since the parameter limit appears to be reached. Pull Request: https://projects.blender.org/blender/blender/pulls/123643