Refactoring option handling.

9 files changed