Updated for RFC 35
zsockopts_test now returns void
Various source cleanups