Removed explicit hiera() function calls

...3.x auto resoltuion to avoid undef => null string.