Small Lucene enhancements for re-building