Issue #22053: Make help work, after previous patch for this issue disabled it
by removing global 'demo'. Refactor and remove duplicate code.
Issue #22053: Make help work, after previous patch for this issue disabled it
by removing global 'demo'. Simple fix because 2.7/3.4 fix cannot merge.
Issue #22061: remove call of useless function slated for removal.
Issue #22061: remove call of useless function slated for removal.