Update options.json to use predef, and remove comments

Also adding a few more globals.