More progress on bug 407059.