diff --git a/.pylintrc b/.pylintrc
index 01184283dfc..90e8989ffcc 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -72,12 +72,13 @@ disable=
 	# TODO(https://github.com/grpc/grpc/issues/261): Maybe we could have
 	# this one if we extracted just a few more helper functions...
 	too-many-nested-blocks,
-	# NOTE(nathaniel): I have disputed the premise of this inspection from
-	# the beginning and will continue to do so until it goes away for good.
+	# TODO(https://github.com/grpc/grpc/issues/261): Disable unnecessary
+	# super-init requirement for abstract class implementations for now.
+	super-init-not-called,
+	# NOTE(nathaniel): A single statement that always returns program
+	# control is better than two statements the first of which sometimes
+	# returns program control and the second of which always returns
+	# program control. Probably generally, but definitely in the cases of
+	# if:/else: and for:/else:.
 	useless-else-on-loop,
-	# NOTE(mmx): Our existing code is written to favor explicit else over
-	# relying on return within a branch.
 	no-else-return,
-	# NOTE(mmx): Disable unnecessary super-init requirement for abstract
-	# class implementations.
-	super-init-not-called,
diff --git a/.pylintrc-tests b/.pylintrc-tests
index 33da14260d7..ebe9d507cdd 100644
--- a/.pylintrc-tests
+++ b/.pylintrc-tests
@@ -103,12 +103,13 @@ disable=
 	# TODO(https://github.com/grpc/grpc/issues/261): Maybe we could have
 	# this one if we extracted just a few more helper functions...
 	too-many-nested-blocks,
-	# NOTE(nathaniel): I have disputed the premise of this inspection from
-	# the beginning and will continue to do so until it goes away for good.
+	# TODO(https://github.com/grpc/grpc/issues/261): Disable unnecessary
+	# super-init requirement for abstract class implementations for now.
+	super-init-not-called,
+	# NOTE(nathaniel): A single statement that always returns program
+	# control is better than two statements the first of which sometimes
+	# returns program control and the second of which always returns
+	# program control. Probably generally, but definitely in the cases of
+	# if:/else: and for:/else:.
 	useless-else-on-loop,
-	# NOTE(mmx): Our existing code is written to favor explicit else over
-	# relying on return within a branch.
 	no-else-return,
-	# NOTE(mmx): Disable unnecessary super-init requirement for abstract
-	# class implementations.
-	super-init-not-called,