A fix for my fix of src/src. Now all basename-deriving code is located in