* Simplify some of the code for the new option for extra directories