OptionMapFactory refactorings.