Modifying reports to use new modifier::join methods