Merge refactoring of report-status parsing.