Refactor #5478: Update bindings for new function definition