Move code to add sockslisten option