Undo TinyxmlString renaming. Fix more whitespaces.