Simplify state machine
Add ArgumentError error actions in all arg states