@patrickallaert Would you prefer to change the logic to be like you suggested for readability? If so feel free, but I'll merge it today so in that case ping me.