Extracting common code into the ez-common package.