Add make_unannounce_data helper function