Some tweaks and fixes in XAssert