These bugs were never present in SS4 as the relevant code had a substantial rewrite at the same time they were introduced in SS3. In SS3, test C still fails. Fixes #4705 Fixes #4987 Fixes #4793