Various puppet-lint and other style fixes