Refactoring minutia.
Add back --edition option.