Simplify as per hiera-puppet 1.x