Oops. ^X^S comes _before_ `cvs commit'. Two more diagnostics gone :-)