- Replace broad cardinal HashSet matching with deterministic mask-based bucket candidates - Prevent corner buckets on straight one-side walls - Route adjacent-two elbow masks only through corner bucket families - Keep complex/opposite masks on full/8-dir bucket families to avoid impossible placements