392.98 Changes to the assertions to simplify and modularize
392.99 Cleanup after assertions changes; added XIO to assertions