Oops. Nasty equality bug.
Fix up formatting.
Don't convert enumerator to iterator if we can use enumerator instead. (More verbose, but more efficient.)