While moving this functionality you got rid of `Selector` and `NumPrimaries` but I think it helps to have those variables as it gives a name to the values.