reordered options-generic definitions to appear first