scratchpad -- the merge is long behind us.

(This file could stand some reorganization -- it's hard to tell the
open items apart from those that are done or nearly done.)