Fix handling of option values as part of the composed definition itself.