Read values for a handful of options in the new way.
Review Request #1114 - Created Oct. 3, 2014 and submitted
Provides an example for mass migration.
Also fixes an issue where we weren't "descoping" old-style options
in all the places they could appear.