be smarter about ordsets in #29