Fix code typo and lint issues

I introduced a bug by rewriting 86174330. As I didn't change the author,
it looked like that was @izidormatusov's fault. Sorry.

Also fixed lint issues to not have a one-character commit.