ENH: Implement Yarik's suggestions.
Merge branch 'neurosbh-paraval' into cmdline_modular

* neurosbh-paraval:
  ENH: Implement Yarik's suggestions.
DOC+BF: Fix docs so tests pass
Merge branch 'neurosbh-paraval' into cmdline_modular

* neurosbh-paraval:
  DOC+BF: Fix docs so tests pass