Even more rST layout fixes