LUCENE-5388: continuing giant edit.