OK; with that in place, this is good to merge.  Any objections?