Documentation fixes and simplifications.