Improve Enumerator Performance

Reverts the strategy for mixed finite/infinite `list/e` and removes unneccessary internal contract usage.