BZ-1175993: improvements on save callback (removing possible
ambiguities)