Thanks for the fixes Gustaf!
Oddly enough, I tried putting extra white space around the block markers and it didn't help. Then I made the CVS updates to get Xinha working. And that also fixed the block markers.
Now I need to track down why the updates have messed up some of the formatting (the edit-notifications-admin line is overwriting the site header----I'll take a look at the diffs and try and puzzle out the css) and everything will be nice again!
Matt