Updated all str() and unicode() calls on self.valueOf_ to use quote_xml() instead.