remove more uses of $__ from @object