Fixed up the setting of the options from what is parsed. Included the corner cases visible in the original C source. Not yet integrated as the sole parser yet.