Recovering from puppet lint corrections, where I introduced a few new errors.