*8524* Self-doc tweaks