More strict usage of export.map (fixes NB#96696)