Same here with the `kwargs` stuff, or whatever solution we settle on.