remove some cruft from emptySet/emptyMap
properly document contains()/defines() for Map