Clean up supportsUpgrades a bit