Making puppet-lint happy again after all the changes