(USE_CONCORD_OBJECT_SYSTEM): New macro; use it instead of