962941 - Don't use ISO names as keys in the progress report.

Also, I changed some line lengths to 100 lines in code blocks that I
altered for this fix.