Issue #58: fix up options handling ....