Some more cleanup during href review.