Tech-Debt: Clean up subreport data-source dialog handling.