Generated documentation
Problem: some dangling use of deprecated methods

Solution: replace with un-deprecated usage.
Merge pull request #804 from hintjens/master

Small cleanups