Ah, never mind. When I started to investigate this problem I was looking at an old tree. I tried to verify that it was still a problem on -head, but missed that r315956 fixed the problem in a different way than I was expecting. Sorry for the noise.