diff --git a/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go b/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go
index 8cc1ccbb6..9b6422c56 100644
--- a/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go
+++ b/src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go
@@ -197,7 +197,6 @@ func (m *monolith) setupFederation() {
 }
 
 func (m *monolith) setupKafka() {
-	var err error
 	if m.cfg.Kafka.UseNaffka {
 		naff, err := naffka.New(&naffka.MemoryDatabase{})
 		if err != nil {
@@ -208,6 +207,7 @@ func (m *monolith) setupKafka() {
 		m.naffka = naff
 		m.kafkaProducer = naff
 	} else {
+		var err error
 		m.kafkaProducer, err = sarama.NewSyncProducer(m.cfg.Kafka.Addresses, nil)
 		if err != nil {
 			log.WithFields(log.Fields{
diff --git a/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go b/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go
index a61342b42..a95156f3d 100644
--- a/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go
+++ b/src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go
@@ -221,14 +221,14 @@ func testRoomserver(input []string, wantOutput []string, checkQueries func(api.R
 	if err != nil {
 		panic(err)
 	}
-	if err := test.WriteConfig(cfg, dir); err != nil {
+	if err = test.WriteConfig(cfg, dir); err != nil {
 		panic(err)
 	}
 
 	outputTopic := string(cfg.Kafka.Topics.OutputRoomEvent)
 
 	exe.DeleteTopic(outputTopic)
-	if err := exe.CreateTopic(outputTopic); err != nil {
+	if err = exe.CreateTopic(outputTopic); err != nil {
 		panic(err)
 	}
 
diff --git a/src/github.com/matrix-org/dendrite/roomserver/input/latest_events.go b/src/github.com/matrix-org/dendrite/roomserver/input/latest_events.go
index d9aa2b455..fe4856070 100644
--- a/src/github.com/matrix-org/dendrite/roomserver/input/latest_events.go
+++ b/src/github.com/matrix-org/dendrite/roomserver/input/latest_events.go
@@ -99,14 +99,14 @@ type latestEventsUpdater struct {
 }
 
 func (u *latestEventsUpdater) doUpdateLatestEvents() error {
-	var err error
 	var prevEvents []gomatrixserverlib.EventReference
 	prevEvents = u.event.PrevEvents()
 	oldLatest := u.updater.LatestEvents()
 	u.lastEventIDSent = u.updater.LastEventIDSent()
 	u.oldStateNID = u.updater.CurrentStateSnapshotNID()
 
-	if hasBeenSent, err := u.updater.HasEventBeenSent(u.stateAtEvent.EventNID); err != nil {
+	hasBeenSent, err := u.updater.HasEventBeenSent(u.stateAtEvent.EventNID)
+	if err != nil {
 		return err
 	} else if hasBeenSent {
 		// Already sent this event so we can stop processing
@@ -119,8 +119,8 @@ func (u *latestEventsUpdater) doUpdateLatestEvents() error {
 
 	eventReference := u.event.EventReference()
 	// Check if this event is already referenced by another event in the room.
-	var alreadyReferenced bool
-	if alreadyReferenced, err = u.updater.IsReferenced(eventReference); err != nil {
+	alreadyReferenced, err := u.updater.IsReferenced(eventReference)
+	if err != nil {
 		return err
 	}
 
diff --git a/src/github.com/matrix-org/dendrite/syncapi/sync/notifier.go b/src/github.com/matrix-org/dendrite/syncapi/sync/notifier.go
index 2fa4279c1..49eed5eb0 100644
--- a/src/github.com/matrix-org/dendrite/syncapi/sync/notifier.go
+++ b/src/github.com/matrix-org/dendrite/syncapi/sync/notifier.go
@@ -67,7 +67,7 @@ func (n *Notifier) OnNewEvent(ev *gomatrixserverlib.Event, userID string, pos ty
 		userIDs := n.joinedUsers(ev.RoomID())
 		// If this is an invite, also add in the invitee to this list.
 		if ev.Type() == "m.room.member" && ev.StateKey() != nil {
-			userID := *ev.StateKey()
+			targetUserID := *ev.StateKey()
 			membership, err := ev.Membership()
 			if err != nil {
 				log.WithError(err).WithField("event_id", ev.EventID()).Errorf(
@@ -77,22 +77,22 @@ func (n *Notifier) OnNewEvent(ev *gomatrixserverlib.Event, userID string, pos ty
 				// Keep the joined user map up-to-date
 				switch membership {
 				case "invite":
-					userIDs = append(userIDs, userID)
+					userIDs = append(userIDs, targetUserID)
 				case "join":
 					// Manually append the new user's ID so they get notified
 					// along all members in the room
-					userIDs = append(userIDs, userID)
-					n.addJoinedUser(ev.RoomID(), userID)
+					userIDs = append(userIDs, targetUserID)
+					n.addJoinedUser(ev.RoomID(), targetUserID)
 				case "leave":
 					fallthrough
 				case "ban":
-					n.removeJoinedUser(ev.RoomID(), userID)
+					n.removeJoinedUser(ev.RoomID(), targetUserID)
 				}
 			}
 		}
 
-		for _, userID := range userIDs {
-			n.wakeupUser(userID, pos)
+		for _, toNotifyUserID := range userIDs {
+			n.wakeupUser(toNotifyUserID, pos)
 		}
 	} else if len(userID) > 0 {
 		n.wakeupUser(userID, pos)