Clean up uses of StorePX in s390