Clean up cons/e enumerator.

Isolates enumerator performance bottleneck.