ENH: Patch from Alex to improve implementation and prepare for splitting the man page into more sections.