Improve variable name
Restore old role restricting behavior

When multiple roles are still possible, the probability models and
bootstrap choose a better role. The old behavior is to restrict
everything according to initial role list, while we currently restrict
matches after each role restriction, which produces worse results.

This really should restore the previous results. A commented out line
can take advantage of the final role list to indeed restrict, in order
to get better results on class selection.