We can continue talking about this change in details, but I find that a bit ridiculous because it's not a very large change in the end. I'm just waiting for #1340 to finally be merged in order to do it.