Address feedback from @taldcroft.