Minor cleanups to Zinc.h