#459: bring option defitition into code rather than yaml files