Add opt(Val) alternative for all opt=Val option forms.
Authored by: dwarren 2017-11-12
Parent: [r9137]
Child: [r9139]
