Addition of a test for pre-existing option values coupled with a default value.

Also reformmated a few places that weren't properly tabbed and delt with
comment wrap that doesn't fit with 80 column display.