Tidy up the SOAP components a bit.