replace kvp with ParsedOption object. This will help expansion further down the line.