s3-waf: clean up socket-wrapper and nss-wrapper a little.