Tweaking things to work with Docs module and CI 3 again.