Fix @CliAvailabilityIndicator for many commands