Small cleanup stuff in XMLReader