The ADD_VAR, ADD_STRUCT, and ADD_OBJECT defines now only will be defined once per file, using OBJECT_CONTEXT to determine the context of the properties being defined.