Yes, we can do much better than just checking the directories. I'll add that as a TODO for now.