Minor fix to the `expand` prompt (pre-selected help command when expanding the prompt) and little refactoring to base methods.