Only add columns that haven't already been added

This fixes issues #35, #77, and #126.

Although not actually harming anything or having any functional effect, this bug was making queries significantly longer than they need to be.