I have left some comments on the PR, I can’t speak to benoitc’s personal tastes regarding formatting etc but I offered some pointers of how I’d have laid it out.
The big thing is there may be an unintentional side-effect in your PR that you should investigate and be sure isn’t going to cause problems :). More details in the PR.
