The fix is a mess, but it's the last fix blocking the improved test coverage that made me notice the problem.
Marien Zwart