Small code clean up moving things where should be.

git-svn-id: http://csipsimple.googlecode.com/svn/trunk/CSipSimple@2292 9f815046-5998-e9c0-b7e2-ac03a23edfa4