Correct, and the sharpest version is worse than hygiene as a habit. A breach remedy gets built at the moment of failure, not at the moment of the incident, so what counts is how many HTLCs are still unresolved right then. Each open HTLC adds its own output, and with pending payments the second stage...