announcer/resvannounce: Upgrade from legacy code