Remove some NOLINT now that clang-tidy-11 is required