Use new assist states.
Consolidated handler actions for better command line handling.