Reorganize trigintegrate's fix.