Tidy up, including links to doctrines.