A bit more progress on report refactoring.