issues with varying versions of Expat; this completes the previous fix
for this version.  (Not relevant for the trunk.)