Issue #22053: Make help work, after previous patch for this issue disabled it

by removing global 'demo'. Refactor and remove duplicate code.