OGM-208 Avoiding repeated specification of option type