Miscellaneous cleanups - give id's to some sections to make more useful
filenames, fix some luckily working references, and also replace some
manual foo(n) with manual references.