Lint + fix for THR-76.