Fix issues clang-pseudo removal issues found post-commit
This amends ed8f78827895050442f544edef2933a60d4a7935 and hopefully
resolves the issues found by:
https://lab.llvm.org/buildbot/#/builders/76/builds/2973
https://lab.llvm.org/buildbot/#/builders/145/builds/1921
