Update for trunk ppx_tools