Fix OptionDefinition break from r212290.

Fixes some structure definitions in CommandObjectType
that needed to be adjusted for a new OptionDefinition
field.