Simplify Socket and Address classes