@Efraim and @Sarah

Thanks for the suggestions.

Pushed as 45881ea747..f703bef87a to master. Closing.

Regards,
RG.