Oops. *Now* synced with lintool's master branch.