Minor rewrites

These need to be extracted from DOCS-1862 to avoid merge hell.