Hi Ludo,

Thanks for reviewing! I've made the suggested changes in the attached patch.