Semi-completed PyDoc refactoring