Merge "Only need one check for is_dir"