Swc-1126: use PassingRecord, and notification suppression

and add tests around these decisions.