Switch to a more extensible id-based system.
(And ignore .DS_Store files.)