Add SIPUSERAGENT, SIPCALLID, and fix some formatting (bug #1593)