Fix the missing plural.
Support new, stricter type checking.