Using new features and some small doc changes in preparation for "doctests".