Fixed up code for XML::Reader interface simplification.