diff --git a/upup/pkg/fi/cloudup/openstack/instance.go b/upup/pkg/fi/cloudup/openstack/instance.go
index 36c051229b..492cb7571f 100644
--- a/upup/pkg/fi/cloudup/openstack/instance.go
+++ b/upup/pkg/fi/cloudup/openstack/instance.go
@@ -66,10 +66,7 @@ func (c *openstackCloud) CreateInstance(opt servers.CreateOptsBuilder, scheduler
 }
 
 func IsPortInUse(err error) bool {
-	if gophercloud.ResponseCodeIs(err, http.StatusConflict) {
-		return true
-	}
-	return false
+	return gophercloud.ResponseCodeIs(err, http.StatusConflict)
 }
 
 // waitForStatusActive uses gopherclouds WaitFor() func to determine when the server becomes "ACTIVE".
diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go
index 0ae70874b2..43f13cdd98 100644
--- a/upup/pkg/fi/cloudup/template_functions.go
+++ b/upup/pkg/fi/cloudup/template_functions.go
@@ -131,10 +131,7 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
 	}
 
 	dest["GossipEnabled"] = func() bool {
-		if cluster.UsesLegacyGossip() {
-			return true
-		}
-		return false
+		return cluster.UsesLegacyGossip()
 	}
 	dest["PublishesDNSRecords"] = func() bool {
 		return cluster.PublishesDNSRecords()