29545:RESTLET: Improve Generator command line option parsing