This adds a couple of new options for options parsing.