Avoid tying current code to current lint tools

Better to get some warnings than to leave soon-to-be-outdated messages around.