Move action keyword to state to resolve ambiguity