Fix a number of the puppet-lint complaints added by recent changes. oops