Tighter enumeration strategy code
Unit test for XML machinery