zink: bnieuwenhuizen said this should be faster and so it is

a couple patches @bnieuwenhuizen hucked over the wall a while ago which are finally up for marging