Pádraig, all,

I rebased my branch for this feature and make the syntax-check
success. I attached the new patch which I hope will satisfy you.

Feel free to comment it, I will take into account whatever you want.

Cheers,

Jérémy