Lots of minor changes to make sphinx happy.