Avoid extrication when it is already the tail.
Optimizing imports and reformatting.