[MOD] Options: improved typing of enums and nested options