Just got the PK stuff into a nice place. Still need to deal with tables with multiple PK columns.