Improve handling of initial and next states for actuation.