changes for map and set expression about constant check