Clean command subklass detection
Injectable argv