Fix an issue I added while fixing LINT issues. Also, be sure we delete the no longer unused field.
Fix another LINT issue.
Clean up and improve our column detection code. It's complicated so we now move it into a new function, which should increase readablility.