Rework around OptionDeclarer facade.