WINDUP-375: Improve syntax of Basic XML Rules Grammar (Also clean up tests a bit.)