[en] even more fixes for A_UNCOUNTABLE and A_PLURAL (mostly)