Fixes for all the N-state model specific code which was lost in r4972.
Authored by: bugman 2008-02-13
Parent: [r4973]
Child: [r4975]
