Split options into a table to allow abbreviations.

11 files changed