…t` consistency to handle invalid entries, and improve loop detection logic.