Remove r16-r31, as they are deprecated on S390