The debugging logic was lagging behind the recent actual logic changes, especially around buildScope.