Make indexer use streaming parser; fix bug in streaming parser