Miscellaneous changes, mostly concerning options parsing.