Guillaume Smet You're right, I was making it more complicated than it needs. Glad it doesn't change the solution: the PR is coming.