@pserwylo Not sure if you like this change. I think it's slightly more elegant, but don't have a strong opinion.