I was able to collapse the two method based matches, %{scope('foo')} and %{hiera('foo')}, but collapsing further is difficult because of the desire to retain backward compatibility with the previous scope syntax %{foo}.