Further minor improvements in terms of *.rst compatibility.