Reporting refactor, part 2b: code nitpicks