added handling of constants equaling constants for C++ map