Many more "on" tests and fudge Supply.(zip|merge)

Oddly enough, identical implementations of .zip and .merge work in the test,
but not when they're pre-compiled in the settings.  Go figure  :-(