Lint-like fixes found by Semmle