Comment by Treffynnon

This doesn't solve the problem at hand either unfortunately. You'll still have a hanging comma in front of `last_name`:

  SELECT 
      -- first_name
       , last_name
       , email_address
    FROM users

When parsed it will look like this query error to the system:

  SELECT
       , last_name
       , email_address
    FROM users