Incorrect title level for waivers

[skyanth]

Because of the new <waiver> and <standard_waiver> elements the code now thinks the waiver title is a lower level than it actually is supposed to be. Some conditional -1 or -2 magic in the title level determination functionality is urgently needed. :)

[skyanth]

(nope)

[skyanth]

Actually, it's the annex 2 title bar that's 'missing' in the separate waivers. (It's not actually missing since separate waivers are not an annex, but it looks weird. Might replace that with a title bar containing the company name [Radically Open Security in our case]).