Repair -l handling, hopefully.
Finish up for now.