Doesn't this pattern nearly obviate the changes in Hiera2?!?