More cleanup/XMLTools additions.