Remove unused typedefs.
Improve progress reporting for index tool.
Improve canonicalization performance