satch

re: AND, agreed that it's possible to make it work today, but when you get more complex scenarios, such as multiple contexts using the same source but in combination with...

Looks good to me, and meets my original request quite nicely. Let me know when you get to a point where you want an alpha test drive or UI review.