Micro optimization: bail earlier in tracking class.
Merge pull request #1070 from dannyvankooten/refactor/tracking

Micro optimization: bail earlier in tracking class. Props @dannyvankooten