Clean up flags, options.
Fix merge conflict.