Won't this fail when `subdir` is None?