Bit more markup cleanup.

I resisted removing all the self-closing slashes. :)