More doc comment fiddling