Fix abbr replacement in some VMs, and make test XML diffing more tolerant of whitespace.