adapting to new bisect_server, inlining