Merge in doc cleanups.