Zone#match changes

Changes for Zone#match with tests.
Avoid using {...} for multi-line blocks.