Further doc refactoring to use new semantics