Fix strict warnings, more testing.

The upgrade class is getting pretty heavily reworked, but I still expect it to
work the way it did previously, except for the change from XML to INI.