fixed enumerator handling, now again using conditional expressions for 'expr' in Enumerator(id: Id, Some(expr))