In-progress restructuring of cross-reference lists.