CORE-3451: made some more changes suggested by lein-kibit