Restore usability of expert commands

[plasorak]

Fix a missing import and remove the need to have entry/exit state and data.