merge in Prasanna's rm, but keep localSocketAddr() idempotent
merge in Prasanna's rm, but keep localSocketAddr() idempotent

(it just feels like it should be, even though really it's called just
once)

Also no need to test and rm. Just rm.

nsd20463/gmx