and `ipython --help-all | wc -l` give 674 lines on both this branch and master.