Cleanup breakage for new state model. Fixes.