Add OptionValue promotion rule.

Fixes #5666