[cvs-nhc98] Re-jig option-processing in the driver script. We need to a