Updates for 2.11.0-M8.

Removed unnecessary test-time dependency on xml.

Eliminated a bunch of unused expression warnings.