CORE-3888: minor changes suggested by lein-kibit