Eliminated stub arguments.
Sessions work for sockets again, using the new strategy.