Fix several problems with ListingEnumerator

I was totally overthinking this when I first wrote it. Works fine now.

Closes #48 and closes #34