Bring back changes to dynamicenumtype. Fix debug.