Message 223921 - Python tracker

Removal of 'demo' as a global name disabled help callbacks. I could have added 'global demo' to main(), but I decided to refactor and remove duplicate code instead. For 3.5, however, refactor would not merge because of #10291, so I made the simplest fix pending a decision on what to do.