Fixed in CVS head.