More robust followups to https://sbforge.org/fisheye/cru/CR-NEWSPAPER-246 .