Direct sibling of D62662, the root cause of the endless combine loop in D62257
https://rise4fun.com/Alive/d3W
Better test coverage.
And actually fix the test coverage (: Sorry for the noise.
Looks reasonable.