Comprehensive removal of almost all occurrences of PopulationSample

Fix https://reciprocitylabs.atlassian.net/browse/CORE-479

Two `# TODO`s. Please review, thanks.