Ah, you are right. I was a bit hasty on this. This looks good to merge to me!