Much improved system for handling setting and getting the option values.