Dropped some unused commented out code.
Added a Holder enabler for Option to support opt should contain (value) syntax.