Remove some more files via 'make upgrade' and fix a typo.