Refactor restart reporter.

This addresses some of @peastman's comments by email.