Use new SCPI_CmdId to clean up code