Option flag rework

split out from topazproject/topaz#474 in prep for implementing the "-W" flag.