Cosmetic changes: rewrapping, `` → $()… before starting the real work