Merge pull request #1804 from Hixie/progress-nits

Clean-up around progress indicators.