There were a few lingering oversights in the patch set distributed earlier; see attached.