Some puppet-lint cleanups.