Fix typos/oversights from last commit.