Fix typo.
Remove checks of obsolete key suffixes.