Remaining halo and documentation issues.

 * Cause _with_halo(s) to be used where appropriate.
 * Fix a docstring.