Switch to using the new Plural constructor instead of the lookup table, for all the built-in strings.
Start to move to remove usage of plural_form.
Fix missing return statements.