https://github.com/durga4github approved this pull request. Requesting to add 2 more negative tests. Other than that, the changes LGTM. Thanks for the unifying/clean-up! https://github.com/llvm/llvm-project/pull/177330