Update to using fresh stdlib functions (listOf(), join(), joinToString())