Fix problems building documentation with newer versions of makeinfo (part 3).

Add more documentation organization fixes. These should have been
included in the prior commits.