REVIEW-3524 move more logic from OptionElements to NotationParser and OptionNotationParserFactory