Tidied SIPMessage code and tests.