Moved back to makeindex for flexibility in cross-referencing.