s390: renamed helpers, added constraints into helpers.