Gets multiple stat assignment working.
Got all unit tests working, and everything seems to work again.

Still need to verify no serious performance regressions.