Some style fixes for stuff that was clearly brough tover from doctests.