Change waitFor callback to forward all arguments to callback