Much simpler cancel detection logic