What about moving wrapper_storage into some better place, say, yast2?