ProgramOptionMap now has a single, consistent data structure