Follow-up to #2922525 by drunken monkey, Berdir, borisson_: Further improved performance of end-of-request indexing.
