To enable pickling (cf. #1) and set the basis for future support of concurrency, the storage of option values and option value stacks should be moved from the Option class (the private class attributes Option.__values and Option.__value_stacks) into individual instances of OptionManager (which will be expected to possess a __dict__).