https://github.com/jmorse approved this pull request. So, this LGTM for both code consolidation, and potential for new new line-zero behaviour is good. Please wait another day before landing though, just in case others chip in. https://github.com/llvm/llvm-project/pull/114613