Complete option names as well.

5 files changed