Issue #38: some cleanup of EmailReportsService