Some last fixes, hopefully, for the N-state model code.
Authored by: bugman 2011-10-12
Parent: [r14866]
Child: [r14868]