Administrator authored Dec 03, 2021 and Florian Uhlig committed Dec 08, 2021

Build glue code for the new enumerator such that it can be properly used in
the macro.