After upgrading and reindexing, I goofed up and hit the 'bitcoind -reindex' command again when it was just done reindexing. So, I could wait another full day for it to finish. Perhaps it's an idea to put a safety in, when starting bitcoind or bitcoin-qt with the -reindex flag, that it first asks if you want to reindex.
If this is too much of a nitwit safety, this issue can be closed.