Cleaning up a bit

although getting the tell-tale "is using deprecated documentation
syntax", hmmmm.