Slightly improved previous pull request merge.