Proposal: further OptionsNG improvements

[Mark Felder]

So we just got done porting most of the tree to a new options syntax and  
now we want to change it again? :-)