Minor code simplification
Also output (some) socket options