#123 Accept a broader range of affirmative values when confirming an upgrade.
Also did some code cleanup.