Merge "More lint checks." into nyc-dev