Better usage labels.
Better handling of short signals.