Modernize for Puppet compat.  Squash bugs.