Of course, I should have removed the obsolete defcustom from that
patch.  Here's the corrected one.