Change multiple runtime finish annoucements to a propper, generic place.