Progress so far on ticket #1468.