Qualify and adjust for DocLink, for #529