Minor refactoring in s390 code.