More removal of defines for basic objects.