Make tempo2 TOA identification work better.