This fixes #345 and fixes #215.
Cross-reference text/link is implemented as RST substitution, so easy to consistently.