Finish adding 'Type' column to tables

See line comments for suggested discussion points for this commit.