broadcast recognition is different now; use MGET macro; small simplifications