Start changing things to use doclist indexes as required. code is not activated yet.