Doc #5829: Improve inline docs