Make the upgrade tolerate existing tables with existing data more naturally