Move large chunks of template bits from template modification blobs and into a dedicated template via macros.
Fix missing "Resolve report" checkbox when deleting a non-expired warning when Report Improvements is installed and the report doesn't (yet) exist resulting in a new report being created in an open state