Changes needed for proper opt-list handling