Thank you very much.  I've created the attached patch based on your suggestions.

Marc, do you approve?