(maint) Improve lint

This work is the result of doing what puppet-lint says should be done.