I remember that I had a mess of various forks and branches, so it must have happened then. I think the first thing I need to do is get a good test case that captures the above but is quicker.