[PATCH] Code cleanups in calbacks in svcsock