Fix more Git merge weirdness with duplicated functions...