Here's a mixed bag of Zink cleanups.
Some of these are arguably bugfixes, but matter only in corner-cases AFAICT.