Is there a better way to clean up options.conf besides removing the existing one and running ./build update_script? Doing so will recreate options.conf with everything properly categorized but then it has all of the default values in place. It's not too hard to fix when you've made a backup of the old one but that's not something you would want to have to do on a regular basis either.