Windup 375: Improve Basic XML Rules Grammar (Also clean up...

tests.)