Improve reindexing speed

Still sucks if we get a cache miss and have to parse; but it beats
getting two cache misses and parsing twice.

Also tweaked the reindexer--we were joining against the text table
for no real reason.

Change-Id: Ica7a2a6a2a154d0832ca80b30cf6fe548bc05090