Item 3 is now fixed by fix for bug 13300.  All that remains is item 4, which
is fairly critical.