Zone#match changes

Changes for Zone#match with tests.
Place the . on the previous line, together with the method call receiver.