Apply lint fixes from 09769d6f