Further tweaks in response to Kristy's comments on #775