Cleanups to the (still-WIP) iteratee-based indexing system