clean up remaining uses of IAE/ISE in CLICommands