diff --git a/acme/common.go b/acme/common.go
index 7d58305f..7cce25fd 100644
--- a/acme/common.go
+++ b/acme/common.go
@@ -93,14 +93,17 @@ func ProvisionerFromContext(ctx context.Context) (v Provisioner, ok bool) {
 	return
 }
 
-// MustLinkerFromContext returns the current provisioner from the given context.
+// MustProvisionerFromContext returns the current provisioner from the given context.
 // It will panic if it's not in the context.
 func MustProvisionerFromContext(ctx context.Context) Provisioner {
-	if v, ok := ProvisionerFromContext(ctx); !ok {
+	var (
+		v  Provisioner
+		ok bool
+	)
+	if v, ok = ProvisionerFromContext(ctx); !ok {
 		panic("acme provisioner is not the context")
-	} else {
-		return v
 	}
+	return v
 }
 
 // MockProvisioner for testing
diff --git a/acme/db.go b/acme/db.go
index fa9aa0de..4cbb3089 100644
--- a/acme/db.go
+++ b/acme/db.go
@@ -71,11 +71,14 @@ func DatabaseFromContext(ctx context.Context) (db DB, ok bool) {
 // MustDatabaseFromContext returns the current database from the given context.
 // It will panic if it's not in the context.
 func MustDatabaseFromContext(ctx context.Context) DB {
-	if db, ok := DatabaseFromContext(ctx); !ok {
+	var (
+		db DB
+		ok bool
+	)
+	if db, ok = DatabaseFromContext(ctx); !ok {
 		panic("acme database is not in the context")
-	} else {
-		return db
 	}
+	return db
 }
 
 // MockDB is an implementation of the DB interface that should only be used as
diff --git a/acme/linker.go b/acme/linker.go
index e59db4ee..d142bf10 100644
--- a/acme/linker.go
+++ b/acme/linker.go
@@ -142,11 +142,14 @@ func LinkerFromContext(ctx context.Context) (v Linker, ok bool) {
 // MustLinkerFromContext returns the current linker from the given context. It
 // will panic if it's not in the context.
 func MustLinkerFromContext(ctx context.Context) Linker {
-	if v, ok := LinkerFromContext(ctx); !ok {
+	var (
+		v  Linker
+		ok bool
+	)
+	if v, ok = LinkerFromContext(ctx); !ok {
 		panic("acme linker is not the context")
-	} else {
-		return v
 	}
+	return v
 }
 
 type baseURLKey struct{}
diff --git a/authority/admin/db.go b/authority/admin/db.go
index b331cc0a..b9894457 100644
--- a/authority/admin/db.go
+++ b/authority/admin/db.go
@@ -92,11 +92,14 @@ func FromContext(ctx context.Context) (db DB, ok bool) {
 // MustFromContext returns the current admin database from the given context. It
 // will panic if it's not in the context.
 func MustFromContext(ctx context.Context) DB {
-	if db, ok := FromContext(ctx); !ok {
+	var (
+		db DB
+		ok bool
+	)
+	if db, ok = FromContext(ctx); !ok {
 		panic("admin database is not in the context")
-	} else {
-		return db
 	}
+	return db
 }
 
 // MockDB is an implementation of the DB interface that should only be used as
diff --git a/authority/authority.go b/authority/authority.go
index a4a76293..95e00a45 100644
--- a/authority/authority.go
+++ b/authority/authority.go
@@ -201,11 +201,14 @@ func FromContext(ctx context.Context) (a *Authority, ok bool) {
 // MustFromContext returns the current authority from the given context. It will
 // panic if the authority is not in the context.
 func MustFromContext(ctx context.Context) *Authority {
-	if a, ok := FromContext(ctx); !ok {
+	var (
+		a  *Authority
+		ok bool
+	)
+	if a, ok = FromContext(ctx); !ok {
 		panic("authority is not in the context")
-	} else {
-		return a
 	}
+	return a
 }
 
 // ReloadAdminResources reloads admins and provisioners from the DB.
diff --git a/db/db.go b/db/db.go
index 03295f22..39452672 100644
--- a/db/db.go
+++ b/db/db.go
@@ -78,11 +78,14 @@ func FromContext(ctx context.Context) (db AuthDB, ok bool) {
 // MustFromContext returns the current database from the given context. It
 // will panic if it's not in the context.
 func MustFromContext(ctx context.Context) AuthDB {
-	if db, ok := FromContext(ctx); !ok {
+	var (
+		db AuthDB
+		ok bool
+	)
+	if db, ok = FromContext(ctx); !ok {
 		panic("authority database is not in the context")
-	} else {
-		return db
 	}
+	return db
 }
 
 // CertificateStorer is an extension of AuthDB that allows to store
diff --git a/scep/authority.go b/scep/authority.go
index 85faba07..1d156752 100644
--- a/scep/authority.go
+++ b/scep/authority.go
@@ -48,11 +48,14 @@ func FromContext(ctx context.Context) (a *Authority, ok bool) {
 // MustFromContext returns the current authority from the given context. It will
 // panic if the authority is not in the context.
 func MustFromContext(ctx context.Context) *Authority {
-	if a, ok := FromContext(ctx); !ok {
+	var (
+		a  *Authority
+		ok bool
+	)
+	if a, ok = FromContext(ctx); !ok {
 		panic("scep authority is not in the context")
-	} else {
-		return a
 	}
+	return a
 }
 
 // SignAuthority is the interface for a signing authority