Try hard to avoid a sequence of several "Z" segments

Change-Id: I14a1f987ed59131fe3f262f81354da0f2d2fe21d