Small simplification in State.