Cleanup comments by Niklas

Finish addressing comments that Niklas made at https://gerrit.wikimedia.org/r/#/c/79810/ .