Re-implement Supply.(zip|merge) with new "on" features

Alas, they break with cryptic "cannot stringify this" message