Assorted improvements following up #6658#6782

nicoddemus merged 1 commit intopytest-dev:masterpytest-dev/pytest:masterfrom

nicoddemus:code-highlight-followupnicoddemus/pytest:code-highlight-followupCopy head branch name to clipboard