remove a debug print
actually test the return_terms codepath
spec case when 2i returns nothing
make indexcollection more resilient to empty 2i results
fix an indent