Support for correctly keying off an option long name instead of the short name