Yet another round of dependency tweaks for documentation building.