- convert the list of zones to use the list macros, and add locking (issue #7027...