addGrandTotals, Lister and Grid rewrites, template changes, PSR-2