diff --git a/go/types/check.go b/go/types/check.go
index 83c81d08..b04b701c 100644
--- a/go/types/check.go
+++ b/go/types/check.go
@@ -36,7 +36,6 @@ type checker struct {
 	methods     map[string][]*Func     // maps type names to associated methods
 	conversions map[*ast.CallExpr]bool // set of type-checked conversions (to distinguish from calls)
 	untyped     map[ast.Expr]exprInfo  // map of expressions without final type
-	lhsVarsList [][]*Var               // type switch lhs variable sets, for 'declared but not used' errors
 	delayed     []func()               // delayed checks that require fully setup types
 
 	firstErr error // first error encountered
diff --git a/go/types/resolver.go b/go/types/resolver.go
index f4d215d4..3477c5cd 100644
--- a/go/types/resolver.go
+++ b/go/types/resolver.go
@@ -465,32 +465,6 @@ func (check *checker) resolveFiles(files []*ast.File) {
 			}
 		}
 	}
-
-	// Each set of implicitly declared lhs variables in a type switch acts collectively
-	// as a single lhs variable. If any one was 'used', all of them are 'used'. Handle
-	// them before the general analysis.
-	// Note: This check could be done on a per-function basis.
-	for _, vars := range check.lhsVarsList {
-		// len(vars) > 0
-		var used bool
-		for _, v := range vars {
-			if v.used {
-				used = true
-			}
-			v.used = true // avoid later error
-		}
-		if !used {
-			v := vars[0]
-			check.errorf(v.pos, "%s declared but not used", v.name)
-		}
-	}
-
-	// spec: "Implementation restriction: A compiler may make it illegal to
-	// declare a variable inside a function body if the variable is never used."
-	// Note: Inner functions are handled via the child scopes of the enclosing function.
-	for _, f := range check.funcList {
-		check.usage(f.sig.scope)
-	}
 }
 
 // dependencies recursively traverses the initialization dependency graph in a depth-first
@@ -571,17 +545,6 @@ func (check *checker) dependencies(obj Object, init *declInfo, path []Object) {
 	}
 }
 
-func (check *checker) usage(scope *Scope) {
-	for _, obj := range scope.elems {
-		if v, _ := obj.(*Var); v != nil && !v.used {
-			check.errorf(v.pos, "%s declared but not used", v.name)
-		}
-	}
-	for _, scope := range scope.children {
-		check.usage(scope)
-	}
-}
-
 // objDecl type-checks the declaration of obj in its respective file scope.
 // See typeDecl for the details on def and cycleOk.
 func (check *checker) objDecl(obj Object, def *Named, cycleOk bool) {
diff --git a/go/types/stmt.go b/go/types/stmt.go
index 6601393e..8c3eee64 100644
--- a/go/types/stmt.go
+++ b/go/types/stmt.go
@@ -44,6 +44,23 @@ func (check *checker) funcBody(name string, sig *Signature, body *ast.BlockStmt)
 	if sig.results.Len() > 0 && !check.isTerminating(body, "") {
 		check.errorf(body.Rbrace, "missing return")
 	}
+
+	// spec: "Implementation restriction: A compiler may make it illegal to
+	// declare a variable inside a function body if the variable is never used."
+	// (One could check each scope after use, but that distributes this check
+	// over several places because CloseScope is not always called explicitly.)
+	check.usage(sig.scope)
+}
+
+func (check *checker) usage(scope *Scope) {
+	for _, obj := range scope.elems {
+		if v, _ := obj.(*Var); v != nil && !v.used {
+			check.errorf(v.pos, "%s declared but not used", v.name)
+		}
+	}
+	for _, scope := range scope.children {
+		check.usage(scope)
+	}
 }
 
 // stmtContext is a bitset describing the environment
@@ -460,7 +477,7 @@ func (check *checker) stmt(ctxt stmtContext, s ast.Stmt) {
 
 		check.multipleDefaults(s.Body.List)
 
-		var lhsVars []*Var               // set of implicitly declared lhs variables
+		var lhsVars []*Var               // list of implicitly declared lhs variables
 		seen := make(map[Type]token.Pos) // map of seen types to positions
 		for _, s := range s.Body.List {
 			clause, _ := s.(*ast.CaseClause)
@@ -471,7 +488,7 @@ func (check *checker) stmt(ctxt stmtContext, s ast.Stmt) {
 			// Check each type in this type switch case.
 			T := check.caseTypes(&x, xtyp, clause.List, seen)
 			check.openScope(clause)
-			// If lhs exists, declare a corresponding variable in the case-local scope if necessary.
+			// If lhs exists, declare a corresponding variable in the case-local scope.
 			if lhs != nil {
 				// spec: "The TypeSwitchGuard may include a short variable declaration.
 				// When that form is used, the variable is declared at the beginning of
@@ -482,24 +499,29 @@ func (check *checker) stmt(ctxt stmtContext, s ast.Stmt) {
 					T = x.typ
 				}
 				obj := NewVar(lhs.Pos(), check.pkg, lhs.Name, T)
+				check.declare(check.topScope, nil, obj)
+				check.recordImplicit(clause, obj)
 				// For the "declared but not used" error, all lhs variables act as
 				// one; i.e., if any one of them is 'used', all of them are 'used'.
 				// Collect them for later analysis.
 				lhsVars = append(lhsVars, obj)
-				check.declare(check.topScope, nil, obj)
-				check.recordImplicit(clause, obj)
 			}
 			check.stmtList(inner, clause.Body)
 			check.closeScope()
 		}
-		// If a lhs variable was declared but there were no case clauses, make sure
-		// we have at least one (dummy) 'unused' variable to force an error message.
-		if len(lhsVars) == 0 && lhs != nil {
-			lhsVars = []*Var{NewVar(lhs.Pos(), check.pkg, lhs.Name, x.typ)}
-		}
-		// Record lhs variables for this type switch, if any.
-		if len(lhsVars) > 0 {
-			check.lhsVarsList = append(check.lhsVarsList, lhsVars)
+
+		// If lhs exists, we must have at least one lhs variable that was used.
+		if lhs != nil {
+			var used bool
+			for _, v := range lhsVars {
+				if v.used {
+					used = true
+				}
+				v.used = true // avoid usage error when checking entire function
+			}
+			if !used {
+				check.errorf(lhs.Pos(), "%s declared but not used", lhs.Name)
+			}
 		}
 
 	case *ast.SelectStmt: