Thanks for rolling this in from the discussion on the other PR.