Some minor follow-ups to https://sbforge.org/fisheye/cru/CR-NAS-235