@Cadair @taldcroft - whoops, I collapsed this discussion in the commit I just sent up.  If you wanted to say more about this, it might be easier to make a comment against the *current* diff.