Port remaining ori cases to S390.