FIX CommandSet: remove old-stype indicators