Small refactoring in s390 related code and fix for bnc813835