XWiki annotations are now embedded inline for the critical documents (i.e. documents in the crit directory) using the <note> element. Each altered file was diffed and checked for accuracy--there were a few instances of bad pointers (it seems that a few TLNs changed in some of the documents, so the entire annotation set was off by 2-3 TLNs) which I had to hand-fix.