We don't neeed to handle both spellings anymore since we don't support Clang 15 anymore.
A few tests were also straightforward to translate to SFINAE tests instead, so in a few cases I did that and removed the .fail.cpp test entirely. Differential Revision: https://reviews.llvm.org/D153149