Improved trigger detection.