XML file DAO and XMLUtil code review changes.

Includes a broken test.