Convert recent additions to use new, "logical" markup.

I suppose we really do need a markup guide.  -sigh-
2 files changed