Refactoring OptionAst.