Try to collapse things

[chris-wood]

More can be done here, but I see some of these separate expectations as belonging to the same high-level point (that no one except the intended endpoints can see the information).