Aight, everything's cleaned up and backported - hopefully correctly.
New versions are up!

Thanks for the report, that tip looking at the chat bounds was very helpful as it made the heuristic more precise!