Improve statement tracking.