Option parsing tables: remove some unnecessary #defines

Also make some strings static and add missing #undef's