Zoomify clean-ups

This PR adds a couple clean-ups following #1731.