Additional fixes to RTD-relate things.

(Note that I cannot test RTD without commiting and pushing.)