Move announcement_signatures handling into new force-close macro