Fix typos (part of #3939).