Oh, the shame. Changeset 54ad947f3b9e happened after I'd been playing with Wrangler - and I accidentally committed some random refactorings. So at least we know Wrangler is correctness-preserving. Still, I feel rather stupid.