Factor out puppet-lint errors and minimise warnings.