No more false positives in loop detection.
Minor fix.
Spec2 updates.
Bug fix.
More tests.
New helper: $map.