Clean up more of schema generation so that we use Table/Column wherever
possible. Add many more TODOs