Fixes #5241: Fix reporting details, and clean reporting structures