diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index ab8758661db..8a2cd452056 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -4655,9 +4655,6 @@ AbortSubTransaction(void)
 	 */
 	XactReadOnly = s->prevXactReadOnly;
 
-	/* Report wait end here, when there is no further possibility of wait */
-	pgstat_report_wait_end();
-
 	RESUME_INTERRUPTS();
 }
 
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
index 76d75a914f3..11e4a51adf6 100644
--- a/src/backend/storage/lmgr/lwlock.c
+++ b/src/backend/storage/lmgr/lwlock.c
@@ -760,9 +760,8 @@ GetLWLockIdentifier(uint8 classId, uint16 eventId)
 
 	/*
 	 * It is quite possible that user has registered tranche in one of the
-	 * backends (e.g. by allocation lwlocks in dynamic shared memory) but not
-	 * all of them, so we can't assume the tranche is registered here.
-	 * extension for such cases.
+	 * backends (e.g. by allocating lwlocks in dynamic shared memory) but
+	 * not all of them, so we can't assume the tranche is registered here.
 	 */
 	if (eventId >= LWLockTranchesAllocated ||
 		LWLockTrancheArray[eventId]->name == NULL)