a tiny bit of cleaning-up in zvm