Improved handling of xml namespace.