Correct logic for handling OG_OBJECT_PROXYs