fixes since defines() is now formal in Map and Correspondence