Some code cleanup from the Savon 2.2 conversion