Comment 2 for bug 503322

I did find a way to shorten up the headings. It's currently somewhat buried in bzr (which is not my VCS of choice), so I should be able to get it out at some point. It may not be a perfect solution by any means.

I went for the book class because it's a book ;).