Improve subdirs support detection.