diff --git a/.vendor/linter b/.vendor/linter
index b40aaf7..e4fab69 160000
--- a/.vendor/linter
+++ b/.vendor/linter
@@ -1 +1 @@
-Subproject commit b40aaf70be8af80f048da777e551c5b790bd9e69
+Subproject commit e4fab69e7f6256682f5b6b80e7a8f2423a0c39a9
diff --git a/sql/object_reference.sql b/sql/object_reference.sql
index 1e35ef3..cbed4f5 100644
--- a/sql/object_reference.sql
+++ b/sql/object_reference.sql
@@ -1480,8 +1480,10 @@ BEGIN
     RAISE DEBUG 'dropped_objects(): %', r;
   END LOOP;
 
-  -- Multiple objects might have been affected
-  -- Could potentially be done with a writable CTE
+  /*
+   * Multiple objects might have been affected
+   * Could potentially be done with a writable CTE
+   */
   FOR r_object_v IN
     SELECT _object_v.*
       FROM pg_catalog.pg_event_trigger_dropped_objects() d
@@ -1570,20 +1572,14 @@ $$);
 
 CREATE EVENT TRIGGER zzz__object_reference_drop
   ON sql_drop
-  -- For debugging
-  --WHEN tag IN ( 'ALTER TABLE', 'DROP TABLE' )
   EXECUTE PROCEDURE _object_reference._etg_drop()
 ;
 CREATE EVENT TRIGGER zzz_object_reference__fix_identity
   ON ddl_command_end
-  -- For debugging
-  --WHEN tag IN ( 'ALTER TABLE', 'DROP TABLE' )
   EXECUTE PROCEDURE _object_reference._etg_fix_identity()
 ;
 CREATE EVENT TRIGGER zzz_object_reference_capture
   ON ddl_command_end
-  -- For debugging
-  --WHEN tag IN ( 'ALTER TABLE', 'DROP TABLE' )
   EXECUTE PROCEDURE _object_reference._etg_capture()
 ;
 
diff --git a/test/dump/load_all.sql b/test/dump/load_all.sql
index 5b73421..0d9dd26 100644
--- a/test/dump/load_all.sql
+++ b/test/dump/load_all.sql
@@ -52,9 +52,6 @@ SELECT c.* FROM test_object o, test__create(o) c ORDER BY o.seq ASC;
 SELECT c.* FROM test_object o, test__register(o) c ORDER BY o.seq DESC; -- Would be nice to randomize...
 SELECT c.* FROM test_object o, test__verify(o) c ORDER BY o.seq ASC;
 
---SET client_min_messages = DEBUG;
---\i test/pgxntool/finish.sql
-
 CREATE SCHEMA test_capture_support;
 SET search_path = test_capture_support, tap, public;
 
diff --git a/test/dump/verify.sql b/test/dump/verify.sql
index c074bc4..044f646 100644
--- a/test/dump/verify.sql
+++ b/test/dump/verify.sql
@@ -55,8 +55,10 @@ SELECT c.*
 ;
 
 
--- First verify that object group prevents drop
--- (see below too)
+/*
+ * First verify that object group prevents drop
+ * (see below too)
+ */
 SELECT c.*
   FROM test_capture_support.test_object o
     --, test_capture_support.test__drop(o) c
@@ -79,8 +81,10 @@ SELECT lives_ok(
 ) FROM object_group_ids
 ;
 
--- Drop objects for real this time
--- (see above too)
+/*
+ * Drop objects for real this time
+ * (see above too)
+ */
 SELECT c.*
   FROM test_capture_support.test_object o
     , test_capture_support.test__drop(o) c
diff --git a/test/helpers/object_table.sql b/test/helpers/object_table.sql
index debd69a..e7a8ab1 100644
--- a/test/helpers/object_table.sql
+++ b/test/helpers/object_table.sql
@@ -143,8 +143,10 @@ INSERT INTO test_prereq VALUES
 , ($$CREATE FUNCTION "test type out"("test type") RETURNS cstring LANGUAGE 'internal' IMMUTABLE AS 'int2in'$$)
 ;
 
--- \N is null character
--- sql-lint:disable-block prefer-short-type: COPY payload data, not real type references
+/*
+ * \N is null character
+ * sql-lint:disable-block prefer-short-type: COPY payload data, not real type references
+ */
 COPY test_object(object_type, object_name, secondary, create_command, drop_command) FROM STDIN (DELIMITER '|');
 table|test table||%("test column" int)|
 index|test table test index||%ON "test table"("test column")|
diff --git a/test/sql/capture.sql b/test/sql/capture.sql
index 2d7c2d2..0f6d712 100644
--- a/test/sql/capture.sql
+++ b/test/sql/capture.sql
@@ -96,8 +96,10 @@ SELECT is_empty(
 -- Create
 SELECT c.* FROM test_object o, test__create(o) c ORDER BY o.seq ASC;
 
--- Manually register an object; make certain it does not show up in group
--- NOTE! Other tests depend on this working!
+/*
+ * Manually register an object; make certain it does not show up in group
+ * NOTE! Other tests depend on this working!
+ */
 SELECT lives_ok(
   $$CREATE TEMP TABLE ogi__object_id AS
       SELECT object_reference.object__getsert('table', 'object_group_ids', NULL) AS object_id
diff --git a/test/sql/event_trigger.sql b/test/sql/event_trigger.sql
index 11e2128..ac04f37 100644
--- a/test/sql/event_trigger.sql
+++ b/test/sql/event_trigger.sql
@@ -67,8 +67,6 @@ SELECT is(
   , 'Exactly 1 test view record'
 );
 
--- s/column_test/column_filler/g
--- Change 1 to 2 in getsert
 SELECT lives_ok(
   $$CREATE TEMP TABLE column_filler AS SELECT * FROM _object_reference._object_v__for_update('table column', 'table_under_test'::regclass, 2)$$
   , $$CREATE TEMP TABLE column_filler AS SELECT * FROM _object_reference._object_v__for_update('table column', 'table_under_test'::regclass, 2)$$