Clean up and remove unnecessary XML comments

Try to use element text whenever possible, and remove any unnecessary XML comments.  Soon the XML will be regenerated and so the XML comments need to be well formed and in predictable locations.