Ooops. *Now* synced with lintool's master (df7f8711c64f7279f4c00ae1e2cc085ea6ed403f).