Yeah, thinking it over we should do this all in options_parsing so that we don't have to track it all down later to remove it from all over the place.  Having it all there will also help us track which options need better validation.