Another checkpoint.

(A bit of a mess, a previous submit apparently didn't go through.)