Refactoring Z construction.