another bit of cleaning-up on zvm