Update to 0.9.9-wip2.