Rename state method _enter to _enter_safe. This allows to use _enter in state definition.
[cli] Improve argument names.