Back to manual counting for field results, still using a single role field.

This reverts the main part of commit 115363b6ce65a7f2c9fe8c7608d37b62cf48f2d3. However, that commit introduced a single role field merging the various roleA* fields, which I am keeping for assumed search performance benefits. We may actually want to use different counting methods for different situations, but this seems ok for now.