diff --git a/lib/Basic/StringExtras.cpp b/lib/Basic/StringExtras.cpp
index 19650b735f7..f1128385d52 100644
--- a/lib/Basic/StringExtras.cpp
+++ b/lib/Basic/StringExtras.cpp
@@ -721,8 +721,6 @@ static bool omitNeedlessWordsMatchingFirstArgumentLabel(
 
 /// Determine whether the given word indicates a boolean result.
 static bool nameIndicatesBooleanResult(StringRef name) {
-  bool isFirstWord = true;
-
   for (auto word: camel_case::getWords(name)) {
     // Auxiliary verbs indicate Boolean results.
     if (getPartOfSpeech(word) == PartOfSpeech::AuxiliaryVerb)
diff --git a/lib/Sema/ITCDecl.cpp b/lib/Sema/ITCDecl.cpp
index 9b87781f7cf..7f8689d3f47 100644
--- a/lib/Sema/ITCDecl.cpp
+++ b/lib/Sema/ITCDecl.cpp
@@ -295,7 +295,7 @@ bool IterativeTypeChecker::isResolveTypeDeclSatisfied(TypeDecl *typeDecl) {
   }
 
   // Module types are always fully resolved.
-  if (auto module = dyn_cast<ModuleDecl>(typeDecl))
+  if (typeDecl->getKind() == DeclKind::Module)
     return true;
 
   // Nominal types.