More lint formatting fixes that didn't show up in local tests.