Updates to rstar model system state handling.

More in line with other models, but not quite the same.