more instrumenting
Optimize globbed file lookups, fixes nasty performance regression