Follow up on "uploadnewversion" code review

Outstanding comments remain in #2688 and #2708.

Please follow up on all code and functional comments. A few of Simon's original comments still remain as well.