Improved speed on the Index builder.