Convert more option vars to the new (single letter) coding style.
12 files changed