Correct names of phrases that hold non-plurality-count data, and fix tally table, after recent refactoring
Minor change, move portion of code to different position