Fixup to 61f0b6f.
Fixup to 6d1b6de.
Fixup to 8a95eb7.
Another fixup to c6c6a30.