CELANUP: improve dump reading/saving code