Merge func Server.ListenAndServe with ListenAndServe

Fix a "fixme": merge Server.ListenAndServe with ListenAndServe