Fixes #1592: making report::expire faster and without errors