Fixing up hiera data defs