Fix upgrades, shortcutting operators are evil.