Revising the handling of state output.