More refinements in the SQL upgrader

I'm glad that this is all happening before the release.