Some refactoring based on `lein kibit`.